Index: /issm/trunk/src/c/objects/FemModel.h
===================================================================
--- /issm/trunk/src/c/objects/FemModel.h	(revision 1882)
+++ /issm/trunk/src/c/objects/FemModel.h	(revision 1883)
@@ -15,27 +15,8 @@
 class FemModel{
 
-	friend  Vec GradJCompute(ParameterInputs* inputs,FemModel* femmodel);
-	friend	void diagnostic_core(DataSet* results,Model* model, ParameterInputs* inputs);
-	friend	void prognostic_core(DataSet* results,Model* model, ParameterInputs* inputs);
-	friend	void control_core(DataSet* results,Model* model, ParameterInputs* inputs);
-	friend	void thermal_core(DataSet* results,Model* model, ParameterInputs* inputs);
-	friend	void thermal_core_nonlinear(Vec* ptg,double* pmelting_offset,FemModel* fem,ParameterInputs* inputs,int analysis_type,int sub_analysis_type);
-	friend	void steadystate_core(DataSet* results,Model* model, ParameterInputs* inputs);
-	friend	void diagnostic_core_nonlinear(Vec* pug,Mat* pK_ff0,Mat* pK_fs0, DataSet* loads, FemModel* fem,ParameterInputs* inputs,int analysis_type,int sub_analysis_type);
-	friend	void diagnostic_core_linear(Vec* ppg,FemModel* fem,ParameterInputs* inputs,int  analysis_type,int sub_analysis_type);
-	friend	void transient_core(DataSet* results,Model* model, ParameterInputs* inputs);
-	friend	void transient_core_2d(DataSet* results,Model* model, ParameterInputs* inputs);
-	friend	void transient_core_3d(DataSet* results,Model* model, ParameterInputs* inputs);
-	friend	double objectivefunctionC(double search_scalar,OptArgs* optargs);
-	friend	int GradJSearch(double* search_vector,FemModel* femmodel,int step);
-	friend	void OutputResults(DataSet* results,char* filename);
-	friend	void WriteLockFile(char* filename);
-	friend	void ControlInitialization(Model* model, ParameterInputs* inputs);
-	friend	void ControlTemporaryResults(Model* model,double* param_g,double* J,int n,ParameterInputs* inputs);
-	friend	void CreateFemModel(FemModel* femmodel,ConstDataHandle MODEL,int analysis_type,int sub_analysis_type);
-	friend	void ProcessResults(DataSet** presults,Model* model,int analysis_type);
-	friend  void SpawnCoreParallel(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, Model* model,ParameterInputs* inputs,int analysis_type,int sub_analysis_type,int counter);
+	/*no private members, as we need access to these datasets quite often!:*/
 
-	private: 
+	public:
+
 		DataSet*            elements;
 		DataSet*            nodes;
@@ -53,6 +34,4 @@
 		Vec                 ys0;
 		Mat                 Gmn;
-
-	public:
 
 		FemModel();